From a40abcf74d21fc96f526b61489a69ba15be5266f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Mon, 27 Apr 2020 11:56:55 +0200 Subject: [PATCH] scalebutton: Shorten finalize() implementation --- gtk/gtkscalebutton.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index 4029279bf8..930b026406 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -512,20 +512,9 @@ gtk_scale_button_finalize (GObject *object) GtkScaleButton *button = GTK_SCALE_BUTTON (object); GtkScaleButtonPrivate *priv = gtk_scale_button_get_instance_private (button); - if (priv->icon_list) - { - g_strfreev (priv->icon_list); - priv->icon_list = NULL; - } - - if (priv->adjustment) - { - g_object_unref (priv->adjustment); - priv->adjustment = NULL; - } - - if (priv->autoscroll_timeout) - g_source_remove (priv->autoscroll_timeout); + g_clear_pointer (&priv->icon_list, g_strfreev); + g_clear_object (&priv->adjustment); + g_clear_handle_id (&priv->autoscroll_timeout, g_source_remove); G_OBJECT_CLASS (gtk_scale_button_parent_class)->finalize (object); } -- 2.30.2